From f87a6848fcbf9e0735b822b7f463a4bb2d0b8258 Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Thu, 12 Mar 2009 10:59:53 +0000 Subject: [PATCH] xend: Allow off-line NIC removal Match a MAC address so device_destroy can remove off-line NICs. Signed-off-by: John Levon --- tools/python/xen/xend/server/netif.py | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/tools/python/xen/xend/server/netif.py b/tools/python/xen/xend/server/netif.py index 469818e8c9..1f0d2a047b 100644 --- a/tools/python/xen/xend/server/netif.py +++ b/tools/python/xen/xend/server/netif.py @@ -24,7 +24,7 @@ import os import random import re -from xen.xend import XendOptions +from xen.xend import XendOptions, sxp from xen.xend.server.DevController import DevController from xen.xend.XendError import VmError from xen.xend.XendXSPolicyAdmin import XSPolicyAdminInstance @@ -196,3 +196,23 @@ class NetifController(DevController): result[x] = y return result + + # match a VIF ID from xenstore, or a MAC address stored in the domain config + def convertToDeviceNumber(self, devid): + try: + return int(devid) + except ValueError: + if type(devid) is not str: + raise VmError("devid %s is wrong type" % str(devid)) + try: + dev = devid.split('/')[-1] + return (int(dev)) + except ValueError: + devs = [d for d in self.vm.info.all_devices_sxpr() + if d[0] == 'vif'] + for nr in range(len(devs)): + dev_type, dev_info = devs[nr] + if (sxp.child_value(dev_info, 'mac').lower() == + devid.lower()): + return nr + raise VmError("unknown devid %s" % str(devid)) -- 2.30.2